Fixes #159: Adds dict support for DefaultFilter #386
Conversation
gabru-md
force-pushed
the
gabru-md-fix-159
branch
from
79d1362 to
5c495af
Compare
gabru-md
changed the title
| String... args) { | ||
| Object... args) { | ||
|
|
||
| List<String> stringArgs = new ArrayList<>(); |
There was a problem hiding this comment.
You could do this all in one loop. In fact, you don't need stringArgs at all. I know this was just moved from another file, but might as well clean it up while we're in here.
| if (arg.length < 1) { | ||
| throw new TemplateSyntaxException(interpreter, getName(), "requires 1 number (divisor) argument"); | ||
| } | ||
| String toMul = arg[0]; | ||
| String toMul = arg[0] == null ? null : Objects.toString(arg[0]); |
There was a problem hiding this comment.
Objects.toString takes care of nulls for you.
There was a problem hiding this comment.
Docs state that it returns "null" and not null.
Also if I use Objects.toString(arg[0]) then the following test breaks. Therefore had to ensure that arg[0] == null check was made.
| @@ -61,7 +64,7 @@ public Object filter(Object object, JinjavaInterpreter interpreter, String... ar | |||
| return object; | |||
| } | |||
|
|
|||
| return args[0]; | |||
| return (args[0] instanceof PyWrapper) ? args[0] : Objects.toString(args[0]); | |||
There was a problem hiding this comment.
this is the only real significant change, right?
There was a problem hiding this comment.
Yes. basically checking if the argument is an instance of PyWrapper then we do not need to convert it into String.
gabru-md
force-pushed
the
gabru-md-fix-159
branch
from
7fd6830 to
ea62429
Compare
adds a fix for #159
prev discussion : #344